Skip to content

Conversation

nnethercote
Copy link
Contributor

And some other literal cleanups.

r? @petrochenkov

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 24, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 24, 2022

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 24, 2022
@nnethercote nnethercote force-pushed the MetaItemLit branch 2 times, most recently from 1621cda to 7ad0a66 Compare November 24, 2022 21:35
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 24, 2022

📌 Commit 7ad0a66 has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 24, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 25, 2022
…enkov

Rename `ast::Lit` as `ast::MetaItemLit`.

And some other literal cleanups.

r? `@petrochenkov`
@matthiaskrgr
Copy link
Member

@bors r- failed in a rollup
#104869 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 25, 2022
@bors
Copy link
Collaborator

bors commented Nov 28, 2022

☔ The latest upstream changes (presumably #104990) made this pull request unmergeable. Please resolve the merge conflicts.

@nnethercote
Copy link
Contributor Author

I fixed the failure.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Nov 28, 2022

📌 Commit e01b8552843a768b1fa550237a50416e4b30acf5 has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 28, 2022
`Lit::from_included_bytes` calls `Lit::from_lit_kind`, but the two call
sites only need the resulting `token::Lit`, not the full `ast::Lit`.

This commit changes those call sites to use `LitKind::to_token_lit`,
which means `from_included_bytes` can be removed.
We already use a mix of `Literal` and `Lit`. The latter is better
because it is shorter without causing any ambiguity.
@nnethercote
Copy link
Contributor Author

And I fixed the conflict.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Nov 28, 2022

📌 Commit a60e337 has been approved by petrochenkov

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2022
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#104804 (Rename `ast::Lit` as `ast::MetaItemLit`.)
 - rust-lang#104891 (Add documentation for `has_escaping_bound_vars`)
 - rust-lang#104933 (interpret: remove PartialOrd from a bunch of types that do not have or need a sensible order)
 - rust-lang#104936 (Ignore bivariant parameters in test_type_match.)
 - rust-lang#104954 (make simple check of prinf function)
 - rust-lang#104956 (Avoid ICE if the Clone trait is not found while building error suggestions)
 - rust-lang#104982 (interpret: get rid of run() function)
 - rust-lang#104998 (Update my mailmap)
 - rust-lang#105006 (stricter alignment enforcement for ScalarPair)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 63ec33e into rust-lang:master Nov 28, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 28, 2022
@nnethercote nnethercote deleted the MetaItemLit branch November 29, 2022 01:33
flip1995 pushed a commit to flip1995/rust that referenced this pull request Dec 1, 2022
…enkov

Rename `ast::Lit` as `ast::MetaItemLit`.

And some other literal cleanups.

r? `@petrochenkov`
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#104804 (Rename `ast::Lit` as `ast::MetaItemLit`.)
 - rust-lang#104891 (Add documentation for `has_escaping_bound_vars`)
 - rust-lang#104933 (interpret: remove PartialOrd from a bunch of types that do not have or need a sensible order)
 - rust-lang#104936 (Ignore bivariant parameters in test_type_match.)
 - rust-lang#104954 (make simple check of prinf function)
 - rust-lang#104956 (Avoid ICE if the Clone trait is not found while building error suggestions)
 - rust-lang#104982 (interpret: get rid of run() function)
 - rust-lang#104998 (Update my mailmap)
 - rust-lang#105006 (stricter alignment enforcement for ScalarPair)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants